Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 21:20:09 +0000 (14:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 21:20:09 +0000 (14:20 -0700)

Trivial merge